This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Repository navigation
Embedded webextension isolated new - #11800
Merged
Merged
Conversation
required due to use of async functions.
Member
Author
|
If everything looks good you can pull the trigger and merge this, @jsha |
jsha
suggested changes
Aug 10, 2017
| python2.7 utils/chromium-translations.py src/chrome/locale/ pkg/xpi-eff/webextension/_locales/ | ||
|
|
||
| do_not_ship="*.py *.xml icon.jpg" | ||
| rm -f pkg/xpi-eff/webextension/$do_not_ship |
Member
There was a problem hiding this comment.
This is wrong; it will delete *.xml and icon.jpg in the current directory. Instead just add one line per thing. Or possibly delete this line? It seems like it's been broken, but hasn't had an ill effect.
Member
Author
|
This is copied directly from makecrx.sh, and only affects the (temporary) deployment directory. I'm confused, do we need icon.jpg in WebExtensions? If so, we should change makecrx.sh as well.
…On August 9, 2017 8:08:11 PM PDT, Jacob Hoffman-Andrews ***@***.***> wrote:
jsha requested changes on this pull request.
> @@ -101,7 +100,26 @@ fi
# Prepare packages suitable for uploading to EFF and AMO, respectively.
[ -d pkg ] || mkdir pkg
rsync -aL --delete --delete-excluded --exclude /chrome/content/rules
src/ pkg/xpi-eff
-cp -a translations/* pkg/xpi-eff/chrome/locale/
+
+# START: The next lines are for embedded WebExtensions, and can be
deleted after the full transition to WebExtensions
+[ -d pkg/xpi-eff/webextension ] || mkdir pkg/xpi-eff/webextension
+rsync -aL --delete chromium/ pkg/xpi-eff/webextension/
+
+mkdir pkg/xpi-eff/webextension/_locales/
+python2.7 utils/chromium-translations.py translations/
pkg/xpi-eff/webextension/_locales/
+python2.7 utils/chromium-translations.py src/chrome/locale/
pkg/xpi-eff/webextension/_locales/
+
+do_not_ship="*.py *.xml icon.jpg"
+rm -f pkg/xpi-eff/webextension/$do_not_ship
This is wrong; it will delete *.xml and icon.jpg in the current
directory. Instead just add one line per thing. Or possible skip this
line? It seems like it's been broken, but hasn't had an ill effect.
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#11800 (review)
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
|
Member
|
Look closely: makecrx: Bash does not repeat the prefix on the do_not_ship variable. |
Member
Author
|
Good catch! I'll fix this when I get home in 10
…On August 9, 2017 8:22:16 PM PDT, Jacob Hoffman-Andrews ***@***.***> wrote:
Look closely:
makecrx:
```
do_not_ship="*.py *.xml icon.jpg"
rm -f $do_not_ship
```
```
do_not_ship="*.py *.xml icon.jpg"
rm -f pkg/xpi-eff/webextension/$do_not_ship
```
Bash does not repeat the prefix on the do_not_ship variable.
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#11800 (comment)
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
|
Member
Author
|
@jsha fixed |
jsha
approved these changes
Aug 10, 2017
Member
Author
|
Woohooo! |
This was referenced Aug 10, 2017
|
Yeah! |
This was referenced Aug 10, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.